# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.1046.15.24 -> 1.1046.15.25 # include/linux/jbd.h 1.22 -> 1.23 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 03/05/14 davem@nuts.ninka.net 1.1046.1.70 # Merge bk://kernel.bkbits.net/acme/net-2.5 # into nuts.ninka.net:/home/davem/src/BK/net-2.5 # -------------------------------------------- # 03/05/14 davem@nuts.ninka.net 1.1046.1.71 # [RTNETLINK]: extern __inline__ --> static inline. # -------------------------------------------- # 03/05/14 davem@nuts.ninka.net 1.1046.1.72 # [TCP]: extern __inline__ --> static inline where appropriate. # -------------------------------------------- # 03/05/14 davem@nuts.ninka.net 1.1046.1.73 # [IPV6]: extern __inline__ --> static inline. # -------------------------------------------- # 03/05/14 davem@nuts.ninka.net 1.1046.1.74 # [IPV4]: Fix ip_finish_output extern decl. # -------------------------------------------- # 03/05/14 davem@nuts.ninka.net 1.1046.1.75 # [AX25]: extern inline --> static inline. # -------------------------------------------- # 03/05/14 davem@nuts.ninka.net 1.1046.1.76 # [NET]: dev_load extern inline --> static inline. # -------------------------------------------- # 03/05/14 davem@nuts.ninka.net 1.1046.1.77 # [APPLETALK]: extern inline --> static inline. # -------------------------------------------- # 03/05/14 davem@nuts.ninka.net 1.1046.1.78 # [PKT_SCHED]: extern inline --> static inline # -------------------------------------------- # 03/05/14 davem@nuts.ninka.net 1.1046.1.79 # [AF_UNIX]: extern inline --> static inline # -------------------------------------------- # 03/05/14 davej@codemonkey.org.uk 1.1046.1.80 # [NETROM]: Fix netdevice leak, from 2.4.x # -------------------------------------------- # 03/05/14 davej@codemonkey.org.uk 1.1046.78.2 # [PATCH] Fix types on inflate.c constants # # This patch from Alan went into 2.4 last august with the comment # "get the types right on the lib/inflate.c constants" # -------------------------------------------- # 03/05/14 davej@codemonkey.org.uk 1.1046.78.3 # [PATCH] Preemption fixes for x86 MSR driver. # # wrmsr is ok, but needs cleans up, second part (rdmsr) # is currently broken. # -------------------------------------------- # 03/05/14 davej@codemonkey.org.uk 1.1046.78.4 # [PATCH] Avoid ide-scsi from starting DMA too soon # # This went into 2.4 with the following comments.. # # ide-scsi driver starts DMA as soon as it writes the ATAPI PACKET command # in command register and before sending the ATAPI command. This will # cause problems on many drives. Right way to do it is to start DMA after # sending the ATAPI command. I am attaching a patch that fixes this. This # patch will allow many more CD-RW drives to work reliably in DMA mode # than do today # # Alan's comment to this diff previously.. # "Thats the least of the 2.5 ide-scsi problems, but yes its probably one to add" # -------------------------------------------- # 03/05/14 davej@codemonkey.org.uk 1.1046.78.5 # [PATCH] i8253 locking. # # There are still a few places where we play with the RTC # directly, with no locking. This catches some of them. # -------------------------------------------- # 03/05/14 davej@codemonkey.org.uk 1.1046.78.6 # [PATCH] sx memleak. # -------------------------------------------- # 03/05/14 davej@codemonkey.org.uk 1.1046.78.7 # [PATCH] Fix ISDN return types. # -------------------------------------------- # 03/05/14 davej@codemonkey.org.uk 1.1046.78.8 # [PATCH] Fix standards compliance bugs in the tty layer # # This went into 2.4 back last August with the comment in $subject. # -------------------------------------------- # 03/05/14 davej@codemonkey.org.uk 1.1046.78.9 # [PATCH] pcwatchdog firmware memory leak # -------------------------------------------- # 03/05/14 davej@codemonkey.org.uk 1.1046.78.10 # [PATCH] iphase fix. # # This went into 2.4 nearly a year back with the wonderfully # descriptive "Fix from maintainer" comment. # -------------------------------------------- # 03/05/14 davej@codemonkey.org.uk 1.1046.78.11 # [PATCH] ASUS P4B SMBus quirks. # # From Dominik Brodowski, comments says it all.. # -------------------------------------------- # 03/05/14 davej@codemonkey.org.uk 1.1046.78.12 # [PATCH] typo # -------------------------------------------- # 03/05/14 davej@codemonkey.org.uk 1.1046.78.13 # [PATCH] Fix pnpbios switch # # Erk, that's a really funny looking switch. # Every case fell through.. # -------------------------------------------- # 03/05/14 davej@codemonkey.org.uk 1.1046.78.14 # [PATCH] copy_to_user check for sgiserial # -------------------------------------------- # 03/05/14 davej@codemonkey.org.uk 1.1046.78.15 # [PATCH] fix module-init-tools ver_linux problem. # # Patch from Steven Cole to fix up ver_linux output on a system # with no module-init-tools, just modutils. # # As noted in bugzilla #267 and at # http://marc.theaimsgroup.com/?l=linux-kernel&m=104492524815220&w=2 # -------------------------------------------- # 03/05/14 davej@codemonkey.org.uk 1.1046.78.16 # [PATCH] Shorten rcu_check_quiescent_state. # # Single spin_unlock path cuts this down a little.. # -------------------------------------------- # 03/05/14 davej@codemonkey.org.uk 1.1046.78.17 # [PATCH] byte counters for mkiss # # From 2.4 from way back 13 months ago.. # -------------------------------------------- # 03/05/14 davej@codemonkey.org.uk 1.1046.78.18 # [PATCH] shorten rclan debug output # # From 2.4 long long ago. # -------------------------------------------- # 03/05/14 davej@codemonkey.org.uk 1.1046.78.19 # [PATCH] i810 no codec fix. # # Syncs up with 2.4 # -------------------------------------------- # 03/05/14 davej@codemonkey.org.uk 1.1046.78.20 # [PATCH] shrink zonelists. # # Originally from Matt Dobson. I've been running with this for a while # in -dj, with no noticable side-effects. # # Matt: # # node_zonelists looks like it should really be declared of size # MAX_NR_ZONES, not GFP_ZONEMASK. GFP_ZONEMASK is currently 15, making # node_zonelists an array of 16 elements. The extra zonelists are all # just duplicates of the *real* zonelists, namely the first 3 entries. # Again, if anyone can explain to me why I'm wrong in my thinking, I'd # love to know. There's certainly no way you could bitwise-and something # with any combination of the GFP_DMA and GFP_HIGHMEM flags to refer to # the 12th zonelist or some such! Or am I crazy? # -------------------------------------------- # 03/05/14 davem@kernel.bkbits.net 1.1046.1.81 # Merge davem@nuts.ninka.net:/home/davem/src/BK/net-2.5 # into kernel.bkbits.net:/home/davem/net-2.5 # -------------------------------------------- # 03/05/15 davem@nuts.ninka.net 1.1046.1.82 # [SUNHME]: Use PCI config space if hm-rev property does not exist. # -------------------------------------------- # 03/05/15 davej@tetrachloride.(none) 1.1046.80.1 # Merge tetrachloride.(none):/mnt/raid/src/kernel/2.5/bk-linus # into tetrachloride.(none):/mnt/raid/src/kernel/2.5/agpgart # -------------------------------------------- # 03/05/15 davej@codemonkey.org.uk 1.1046.80.2 # [AGPGART] pci_driver structures must remain valid while they are registered. # Spotted by Russell King. # -------------------------------------------- # 03/05/15 rmk@flint.arm.linux.org.uk 1.1046.44.13 # [ARM] Fix SA1100_ir irqreturn_t. # -------------------------------------------- # 03/05/15 rmk@flint.arm.linux.org.uk 1.1046.44.14 # [ARM] Fix RiscPC i2c drivers for device model. # # These drivers got missed when the i2c subsystem was converted to the # device model. # -------------------------------------------- # 03/05/15 mochel@osdl.org 1.1046.55.5 # driver model: Add resources to struct platform_device. # # From Russell King: # # The location and interrupt of some platform devices are only known by # platform specific code. In order to avoid putting platform specific # parameters into drivers, place resource and irq members into struct # platform_device. # -------------------------------------------- # 03/05/15 akpm@digeo.com 1.1046.81.1 # [PATCH] ipmi warning fixes # # CPU flags are unsigned long. # -------------------------------------------- # 03/05/15 akpm@digeo.com 1.1046.81.2 # [PATCH] sound/core comparison fix # # From: Hal Duston # # This fixes a bug that appears to have crept in between 2.5.69-mm1 and # 2.5.69-mm2 with the "switch most remaining drivers over to devfs_mk_bdev" # patch # -------------------------------------------- # 03/05/15 akpm@digeo.com 1.1046.81.3 # [PATCH] pass the stack protection flags into put_dirty_page() # # put_dirty_page() currently assumes PAGE_COPY for the stack page's ptes. But # for x86_64 (at least) this is not the case. # # The patch adds the extra arg to put_dirty_page(), updates all callers and fixes # x86_64. # -------------------------------------------- # 03/05/15 akpm@digeo.com 1.1046.81.4 # [PATCH] fix hugetlbpage scoping # # From: norbert_wolff@t-online.de (Norbert Wolff) # # In arch/i386/mm/hugetlbpage.c htlbzone_pages and htlbpage_freelist are # declared static at the Top of the File and later in set_hugetlb_mem_size() # as extern. # # gcc-3.4 does not accept this conflict. # -------------------------------------------- # 03/05/15 akpm@digeo.com 1.1046.81.5 # [PATCH] DAC960 typedef cleanup patch # # From: Dave Olien # # I'm forwarding this patch to the DAC9690 driver from Christoph. I've # applied it to the 2.5.69 DAC960 driver, compiled it, and ran it through # some tests on both V1 and V2 type controllers. It looks good. # -------------------------------------------- # 03/05/15 akpm@digeo.com 1.1046.81.6 # [PATCH] loop.c warning removal # # From: Rusty Russell # # loop.c has one of those places where manipulating own refcounts is safe: to # get into the ioctl handler you need to have the device open, so that holds a # refcount already (verified that this actually happens). # # The compile warning is irritating. # -------------------------------------------- # 03/05/15 akpm@digeo.com 1.1046.81.7 # [PATCH] mtrr warning fix # # From: Faik Uygur : # # mtrr_file_del() is using the wrong thing for fcount. This causes it to # print mtrr: MTRR 2 not used" twice when exiting X. # -------------------------------------------- # 03/05/15 akpm@digeo.com 1.1046.81.8 # [PATCH] SMI clearing fix # # From: john stultz # # I've been having problems with ACPI on a box here in our lab. Some of our # more recent hardware requires that SMIs are routed through the IOAPIC, thus # when we clear_IO_APIC() at boot time, we clear the BIOS initialized SMI # pin. This basically clobbers the SMI so we can then never make the # transition into ACPI mode. # # This patch simply reads the apic entry in clear_IO_APIC to make sure the # delivery_mode isn't dest_SMI. If it is, we leave the apic entry alone and # return. # # With this patch, the box boots and SMIs function properly. # -------------------------------------------- # 03/05/15 akpm@digeo.com 1.1046.81.9 # [PATCH] Make debugging variant of spinlocks a bit more robust # # From: Petr Vandrovec # # While I was trying to hunt down problem with spin_lock_irq in # send_sig_info, I noticed that debugging spinlocks are a bit unusable. # # The problem is that these spinlocks first print warning, and then # decrement babble. So if the lock is used by printk code (like runqueue # lock was), we get nothing, just a lockup or a double fault... When we # first decrement babble and then print the error message we can break # this unfortunate situation and the error message (5 of the same...) # appear on screen. # -------------------------------------------- # 03/05/15 akpm@digeo.com 1.1046.81.10 # [PATCH] fix lots of error-path memory leaks # # From Badari Pulavarti. # # Fixes lots of error-path memleaks which the Stanford guys found. # -------------------------------------------- # 03/05/15 akpm@digeo.com 1.1046.81.11 # [PATCH] miropcm20-rds.c build fix # # It needs fs.h for struct inode. # -------------------------------------------- # 03/05/15 akpm@digeo.com 1.1046.81.12 # [PATCH] synclink_cs update # # From: Paul Fulghum # # * Remove PCMCIA release from timer context # * Add irqreturn_t to ISR # * Add dosyncppp module parameter # -------------------------------------------- # 03/05/15 akpm@digeo.com 1.1046.81.13 # [PATCH] remove some cruft from smp.h # # From: Christoph Hellwig # # Remove smp.h leftovers. From the ia64 tree. # -------------------------------------------- # 03/05/15 akpm@digeo.com 1.1046.81.14 # [PATCH] ->llseek returns loff_t, even for /dev/mem # # From: Christoph Hellwig # # memory_lseek() should return a loff_t. # -------------------------------------------- # 03/05/15 akpm@digeo.com 1.1046.81.15 # [PATCH] visws: fix for generic-subarch # # From: Andy Wihitcroft # # The generic-subarch patch broke visws builds. # -------------------------------------------- # 03/05/15 akpm@digeo.com 1.1046.81.16 # [PATCH] fix bug in drivers/net/cs89x0.c:set_mac_address() # # From: Bernardo Innocenti # # the following patch fixes a bug in the CS89xx net device which would set # new MAC address through SIOCSIFHWADDR _only_ when net_debug is set, which # is obviously not what it was meant to do. The original code bogusly # interpreted the addr argument as a buffer containing the MAC address # instead of a struct sockaddr. # -------------------------------------------- # 03/05/15 davej@tetrachloride.(none) 1.1046.80.3 # Merge tetrachloride.(none):/mnt/raid/src/kernel/2.5/bk-linus # into tetrachloride.(none):/mnt/raid/src/kernel/2.5/agpgart # -------------------------------------------- # 03/05/15 davej@codemonkey.org.uk 1.1046.80.4 # [AGPGART] nForce driver needs its own insert/remove routines. # These can't use the generic routines due to alignment issues. # -------------------------------------------- # 03/05/15 davej@codemonkey.org.uk 1.1046.80.5 # [AGPGART] Fix oops in VIA initialisation. # From Christoph. # -------------------------------------------- # 03/05/15 kai@tp1.ruhr-uni-bochum.de 1.1046.82.1 # Merge tp1.ruhr-uni-bochum.de:/scratch/kai/kernel/v2.5/linux-2.5 # into tp1.ruhr-uni-bochum.de:/scratch/kai/kernel/v2.5/linux-2.5.make # -------------------------------------------- # 03/05/15 kai@tp1.ruhr-uni-bochum.de 1.1046.83.1 # Merge tp1.ruhr-uni-bochum.de:/scratch/kai/kernel/v2.5/linux-2.5 # into tp1.ruhr-uni-bochum.de:/scratch/kai/kernel/v2.5/linux-2.5.isdn # -------------------------------------------- # 03/05/15 mochel@osdl.org 1.1046.81.17 # Merge osdl.org:/home/mochel/src/kernel/devel/linux-2.5-virgin # into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-core # -------------------------------------------- # 03/05/15 acme@conectiva.com.br 1.1046.84.1 # o wanrouter: don't use typedefs for wan_device, just struct wan_device # -------------------------------------------- # 03/05/15 gibbs@overdrive.btc.adaptec.com 1.1046.85.1 # Merge http://linux.bkbits.net/linux-2.5 # into overdrive.btc.adaptec.com:/usr/home/gibbs/bk/linux-2.5 # -------------------------------------------- # 03/05/15 akpm@digeo.com 1.1046.86.1 # [PATCH] Allow architecture to overwrite stack flags # # This is a bit neater. # -------------------------------------------- # 03/05/15 eranian@hpl.hp.com 1.1046.77.12 # [PATCH] ia64: perfmon fix # # This patch allows users to set the PMC to their default value, even # though the value might conflict with the type of monitoring # session. This is fine because default values ensure the monitor is not # active. # -------------------------------------------- # 03/05/15 acme@conectiva.com.br 1.1046.84.2 # o wanrouter: kill netdevice_t, do as all the rest of the tree, use struct net_device # -------------------------------------------- # 03/05/15 mochel@osdl.org 1.1046.81.18 # driver model: Modify resource representation in struct platform_device. # # This way, we can easily handle devices that contain an arbitrary number of # resources reported by the platform. # -------------------------------------------- # 03/05/15 bgerst@didntduck.org 1.1046.86.2 # [PATCH] remove fake_sep_struct # # fake_sep_struct is no longer used. # -------------------------------------------- # 03/05/15 mochel@osdl.org 1.1046.81.19 # Merge osdl.org:/home/mochel/src/kernel/devel/linux-2.5-virgin # into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-core # -------------------------------------------- # 03/05/15 sri@us.ibm.com 1.1042.131.11 # [SCTP] SCTP_SHUTDOWN_EVENT notification support. # -------------------------------------------- # 03/05/15 torvalds@home.transmeta.com 1.1046.81.20 # Merge bk://ldm.bkbits.net/linux-2.5-core # into home.transmeta.com:/home/torvalds/v2.5/linux # -------------------------------------------- # 03/05/15 acme@conectiva.com.br 1.1046.84.3 # o wan/cycx: typedef cleanup # -------------------------------------------- # 03/05/15 davem@nuts.ninka.net 1.1046.1.83 # Merge nuts.ninka.net:/home/davem/src/BK/network-2.5 # into nuts.ninka.net:/home/davem/src/BK/net-2.5 # -------------------------------------------- # 03/05/15 akpm@digeo.com 1.1046.1.84 # [CRYPTO]: Fix memcpy/memset args. # -------------------------------------------- # 03/05/15 chas@cmf.nrl.navy.mil 1.1046.1.85 # [ATM]: Fix module handling in USB speedtouch driver. # -------------------------------------------- # 03/05/15 chas@cmf.nrl.navy.mil 1.1046.1.86 # [ATM]: Add refcounting to atmdev. # -------------------------------------------- # 03/05/16 rmk@flint.arm.linux.org.uk 1.1046.44.15 # [ARM] Update Acorn platform scsi drivers. # # These were broken by two changes - the removal of the old device model # class code, and when scsi device lists appeared. This cset allows # these drivers to build again. We also drop some unnecessary code # from one of the drivers. # -------------------------------------------- # 03/05/15 yoshfuji@linux-ipv6.org 1.1046.1.87 # [IPV6]: ARCnet support, driver side. # -------------------------------------------- # 03/05/15 yoshfuji@linux-ipv6.org 1.1046.1.88 # [IPV6]: ARCnet support, protocol side. # -------------------------------------------- # 03/05/15 davem@nuts.ninka.net 1.1046.1.89 # Merge bk://kernel.bkbits.net/acme/net-2.5 # into nuts.ninka.net:/home/davem/src/BK/net-2.5 # -------------------------------------------- # 03/05/15 davem@nuts.ninka.net 1.1046.1.90 # Merge bk://kernel.bkbits.net/acme/net-2.5 # into nuts.ninka.net:/home/davem/src/BK/net-2.5 # -------------------------------------------- # 03/05/15 acme@conectiva.com.br 1.1046.84.4 # o wan/cycx: fix module refcounting, removing MOD_{INC,DEC}_USE_COUNT # -------------------------------------------- # 03/05/15 davem@nuts.ninka.net 1.1046.1.91 # Merge bk://kernel.bkbits.net/acme/net-2.5 # into nuts.ninka.net:/home/davem/src/BK/net-2.5 # -------------------------------------------- # 03/05/15 acme@conectiva.com.br 1.1046.84.5 # o wan/cycx: further cleanups # # . remove whitespaces # . use tabs instead of sequences of 8 spaces # . remove the wrappers for write{b,w} & friends # . align case entries with corresponding switch statement # -------------------------------------------- # 03/05/15 davem@nuts.ninka.net 1.1046.1.92 # Merge bk://kernel.bkbits.net/acme/net-2.5 # into nuts.ninka.net:/home/davem/src/BK/net-2.5 # -------------------------------------------- # 03/05/15 acme@conectiva.com.br 1.1046.84.6 # o wan/cycx: remove more typedefs # # Also use kernel-doc for struct cycx_hw # -------------------------------------------- # 03/05/15 davem@nuts.ninka.net 1.1046.1.93 # Merge bk://kernel.bkbits.net/acme/net-2.5 # into nuts.ninka.net:/home/davem/src/BK/net-2.5 # -------------------------------------------- # 03/05/15 acme@conectiva.com.br 1.1046.84.7 # o wan/cycx: remove the last typedefs, some kernel doc comments # -------------------------------------------- # 03/05/15 davem@nuts.ninka.net 1.1046.1.94 # Merge bk://kernel.bkbits.net/acme/net-2.5 # into nuts.ninka.net:/home/davem/src/BK/net-2.5 # -------------------------------------------- # 03/05/15 acme@conectiva.com.br 1.1046.84.8 # o wan/cycx: use min_t and remove one more private MIN() implementation # -------------------------------------------- # 03/05/15 davem@nuts.ninka.net 1.1046.1.95 # Merge bk://kernel.bkbits.net/acme/net-2.5 # into nuts.ninka.net:/home/davem/src/BK/net-2.5 # -------------------------------------------- # 03/05/15 davem@nuts.ninka.net 1.1046.1.96 # [NET]: Split out policy flow cache to be a generic facility. # -------------------------------------------- # 03/05/15 chas@cmf.nrl.navy.mil 1.1046.1.97 # [ATM]: Allow ATM to be loaded as a module. # -------------------------------------------- # 03/05/15 davem@nuts.ninka.net 1.1046.1.98 # [ATM]: common.c needs linux/init.h # -------------------------------------------- # 03/05/16 acme@conectiva.com.br 1.1046.84.9 # o ipx: remove debug message for successfull bind # -------------------------------------------- # 03/05/15 davem@nuts.ninka.net 1.1046.1.99 # [ATM]: atm{pvc,svc}_exit cannot be __exit. # -------------------------------------------- # 03/05/15 davem@nuts.ninka.net 1.1046.1.100 # Merge bk://kernel.bkbits.net/acme/net-2.5 # into nuts.ninka.net:/home/davem/src/BK/net-2.5 # -------------------------------------------- # 03/05/15 arun.sharma@intel.com 1.1046.77.13 # [PATCH] ia64: make ia32 ioctl()s work again # # -------------------------------------------- # 03/05/15 davem@nuts.ninka.net 1.1046.1.101 # [NET]: Regenerate flow cache hash rnd more sanely. # -------------------------------------------- # 03/05/15 davem@nuts.ninka.net 1.1046.1.102 # [NET]: Hoplimit is a metric not a route attribute. # -------------------------------------------- # 03/05/15 davidm@tiger.hpl.hp.com 1.1046.77.14 # ia64: Fix obsolete call to ia64_set_fpu_owner() (affected UP only). # -------------------------------------------- # 03/05/15 davidm@tiger.hpl.hp.com 1.1046.77.15 # ia64: Re-enable -frename-registers for McKinley. # -------------------------------------------- # 03/05/15 davidm@tiger.hpl.hp.com 1.1046.15.25 # Undo previous pasting-operator "fix". Code was right and pre3.4 compiler was # (temporarily) broken. # -------------------------------------------- # diff -Nru a/include/linux/jbd.h b/include/linux/jbd.h --- a/include/linux/jbd.h Mon Sep 22 12:59:49 2003 +++ b/include/linux/jbd.h Mon Sep 22 12:59:49 2003 @@ -279,9 +279,9 @@ printk(KERN_ERR why); \ } \ } while (0) -#define J_EXPECT(expr, why...) __journal_expect(expr, why) -#define J_EXPECT_BH(bh, expr, why...) __journal_expect(expr, why) -#define J_EXPECT_JH(jh, expr, why...) __journal_expect(expr, why) +#define J_EXPECT(expr, why...) __journal_expect(expr, ## why) +#define J_EXPECT_BH(bh, expr, why...) __journal_expect(expr, ## why) +#define J_EXPECT_JH(jh, expr, why...) __journal_expect(expr, ## why) #endif enum jbd_state_bits {